* configure.ac [alpha]: Explicit error in non-ELF case.

* doc/emacs/ack.texi (Acknowledgments): Comment out old alpha stuff.

* lisp/emacs-lisp/authors.el (authors-fixed-entries):
Comment out old alpha stuff.

diff --git a/ChangeLog b/ChangeLog
index e5e60bfe42c1f811c445a5df21fe88b394cf908d..a755b5c577a1e104d1a41e85488799b18a2adfd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-13  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac [alpha]: Explicit error in non-ELF case.  (Bug#15601)
+
 2013-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:

diff --git a/configure.ac b/configure.ac
index 40da4af157e2a464625f1ed4a423e8bec6c86478..ee6d6959ba69e18ef38b38fbb3bd24ca530c0354 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1175,10 +1175,13 @@ case $canonical in
     if test "x$GCC" = "xyes"; then
       C_SWITCH_MACHINE="-fno-common"
     else
-      AC_MSG_ERROR([What gives?  Fix me if DEC Unix supports ELF now.])
+      AC_MSG_ERROR([Non-GCC compilers are not supported.])
     fi
   else
-    UNEXEC_OBJ=unexalpha.o
+      dnl This was the unexalpha.c case.  Removed in 24.1, 2010-07-24,
+      dnl albeit under the mistaken assumption that said file
+      dnl was no longer used.
+      AC_MSG_ERROR([Non-ELF systems are not supported since Emacs 24.1.])
   fi
   ;;
 esac

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 315f65f1133ce3d38b4c1b47c4798f021bc68242..01795fed95a3ad0465877a0537229c739ae1bb49 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-13  Glenn Morris  <rgm@gnu.org>
+
+       * ack.texi (Acknowledgments): Comment out old alpha stuff.
+
 2013-10-13  Xue Fuqiao  <xfq.free@gmail.com>
 
        * calendar.texi (Special Diary Entries): Remove @refill.

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 7c0d28c752ae36cacc4a301093ae4aaa5a6dbefb..0cfcfb5e4b3fc1394e23794c51b717d01cd4804c 100644 (file)
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1099,9 +1099,11 @@ Ronald S. Schnell wrote @file{dunnet.el}, a text adventure game.
 Philippe Schnoebelen wrote @file{gomoku.el}, a Go Moku game played
 against Emacs; and @file{mpuz.el}, a multiplication puzzle.
 
-@c FIXME files no longer included; but see bug 15601.
+@ignore
+@c Removed in 24.1.
 @item
 Rainer Schöpf contributed to Alpha and OSF1 support.
+@end ignore
 
 @item
 Jan Schormann wrote @file{solitaire.el}, an implementation of the

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fed80bf754d63d9493052e5c7aa20067afd239a7..c8c0ac80a12883b75f93f6692acf3ab17286697b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-13  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/authors.el (authors-fixed-entries):
+       Comment out old alpha stuff.
+
 2013-10-13  Dmitry Gutov  <dgutov@yandex.ru>
 
        * progmodes/ruby-mode.el (ruby-mode): Add `ruby-mode-set-encoding'

diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 809511cb6b7f6debfcc42f9fcd0457ef01b2edc2..92796ac4e999b47883e77d77edc78ca92198efa8 100644 (file)
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -518,8 +518,8 @@ Changes to files in this list are not listed.")
     ("Schlumberger Technology Corporation" :changed "gud.el")
     ;; Replaced by tcl.el.
 ;;;    ("Gregor Schmid" :wrote "tcl-mode.el")
-    ;; FIXME files no longer included; but see bug 15601
-    ("Rainer Schöpf" :wrote "alpha.h" "unexalpha.c")
+    ;; No longer distributed since 24.1.
+;;;    ("Rainer Schöpf" :wrote "alpha.h" "unexalpha.c")
     ;; No longer distributed: emacsserver.c.
     ("William Sommerfeld" :wrote "emacsclient.c" "scribe.el")
     ;; No longer distributed: emacsserver.c.